:art: Support is_audit_pass / is_selected
huangqimin001
4 fichiers modifiés avec 32 ajouts et 3 suppressions
+ 4
- 1
api/member_views.py
@@ -550,14 +550,17 @@ def activity_contribute_list(request): |
||
| 550 | 550 |
user_id = request.POST.get('user_id', '')
|
| 551 | 551 |
activity_id = request.POST.get('activity_id', '')
|
| 552 | 552 |
content_type = get_query_value(request, 'content_type', val_cast_type='int') |
| 553 |
+ is_selected = get_query_value(request, 'is_selected', val_cast_type='int') |
|
| 553 | 554 |
page = request.POST.get('page', 1)
|
| 554 | 555 |
num = request.POST.get('num', 20)
|
| 555 | 556 |
|
| 556 |
- contributions = MemberActivityContributionInfo.objects.filter(content_type=content_type, status=True) |
|
| 557 |
+ contributions = MemberActivityContributionInfo.objects.filter(content_type=content_type, is_audit_pass=True, status=True) |
|
| 557 | 558 |
if user_id: |
| 558 | 559 |
contributions = contributions.filter(user_id=user_id) |
| 559 | 560 |
if activity_id: |
| 560 | 561 |
contributions = contributions.filter(activity_id=activity_id) |
| 562 |
+ if is_selected: |
|
| 563 |
+ contributions = contributions.filter(is_selected=True) |
|
| 561 | 564 |
contributions = contributions.order_by('-pk')
|
| 562 | 565 |
contributions, left = pagination(contributions, page, num) |
| 563 | 566 |
contributions = [contribution.data for contribution in contributions] |
+ 2
- 2
member/admin.py
@@ -99,8 +99,8 @@ class MemberActivityGroupShareInfoAdmin(admin.ModelAdmin): |
||
| 99 | 99 |
|
| 100 | 100 |
|
| 101 | 101 |
class MemberActivityContributionInfoAdmin(admin.ModelAdmin): |
| 102 |
- list_display = ('contribution_id', 'activity_id', 'content_type', 'title', 'content', 'images', 'video_url', 'status', 'created_at', 'updated_at')
|
|
| 103 |
- list_filter = ('activity_id', 'content_type', 'status')
|
|
| 102 |
+ list_display = ('contribution_id', 'activity_id', 'content_type', 'title', 'content', 'images', 'video_url', 'is_audit_pass', 'is_selected', 'status', 'created_at', 'updated_at')
|
|
| 103 |
+ list_filter = ('activity_id', 'content_type', 'is_audit_pass', 'is_selected', 'status')
|
|
| 104 | 104 |
|
| 105 | 105 |
|
| 106 | 106 |
admin.site.register(GoodsInfo, GoodsInfoAdmin) |
+ 23
- 0
member/migrations/0037_auto_20221023_2010.py
@@ -0,0 +1,23 @@ |
||
| 1 |
+# Generated by Django 3.2.16 on 2022-10-23 12:10 |
|
| 2 |
+ |
|
| 3 |
+from django.db import migrations, models |
|
| 4 |
+ |
|
| 5 |
+ |
|
| 6 |
+class Migration(migrations.Migration): |
|
| 7 |
+ |
|
| 8 |
+ dependencies = [ |
|
| 9 |
+ ('member', '0036_memberactivitycontributioninfo_video_url'),
|
|
| 10 |
+ ] |
|
| 11 |
+ |
|
| 12 |
+ operations = [ |
|
| 13 |
+ migrations.AddField( |
|
| 14 |
+ model_name='memberactivitycontributioninfo', |
|
| 15 |
+ name='is_audit_pass', |
|
| 16 |
+ field=models.BooleanField(default=False, help_text='是否审核通过', verbose_name='is_audit_pass'), |
|
| 17 |
+ ), |
|
| 18 |
+ migrations.AddField( |
|
| 19 |
+ model_name='memberactivitycontributioninfo', |
|
| 20 |
+ name='is_selected', |
|
| 21 |
+ field=models.BooleanField(default=False, help_text='是否入围', verbose_name='is_selected'), |
|
| 22 |
+ ), |
|
| 23 |
+ ] |
+ 3
- 0
member/models.py
@@ -694,6 +694,9 @@ class MemberActivityContributionInfo(BaseModelMixin): |
||
| 694 | 694 |
images = JSONField(_(u'images'), default=[], help_text=u'图片列表') |
| 695 | 695 |
video_url = models.CharField(_(u'video_url'), max_length=255, blank=True, null=True, help_text=u'视频链接') |
| 696 | 696 |
|
| 697 |
+ is_audit_pass = models.BooleanField(_(u'is_audit_pass'), default=False, help_text=u'是否审核通过') |
|
| 698 |
+ is_selected = models.BooleanField(_(u'is_selected'), default=False, help_text=u'是否入围') |
|
| 699 |
+ |
|
| 697 | 700 |
class Meta: |
| 698 | 701 |
verbose_name = _(u'会员活动投稿信息') |
| 699 | 702 |
verbose_name_plural = _(u'会员活动投稿信息') |